Merge from emacs--rel--22

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 43-44)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 229)

   - Merge from emacs--devo--0, emacs--rel--22

2007-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/font-lock.el (font-lock-add-keywords): In case font-lock was only
   half-activated, forcefully activate it completely.

2007-06-11  Richard Stallman  <rms@gnu.org>

   * lisp/cus-edit.el (custom-variable-type): Doc fix.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-797